From db79c628fd6803216d1de6f33348f4c02631101a Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Sat, 26 Mar 2005 00:58:38 +0000 Subject: [PATCH] bitkeeper revision 1.1236.1.139 (4244ed8av78xbyCpls2_iCEIZlMdFQ) Fix failsafe handling on x86/32 (failsafe callback address was not read correctly causing crash when booting 2.4 guests). Signed-off-by: Keir Fraser --- xen/arch/x86/x86_32/entry.S | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index b1d9d5ecee..c7192d9f6a 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -218,6 +218,7 @@ failsafe_callback: GET_CURRENT(%ebx) leal EDOMAIN_trap_bounce(%ebx),%edx movl EDOMAIN_failsafe_addr(%ebx),%eax + movl %eax,TRAPBOUNCE_eip(%edx) movl EDOMAIN_failsafe_sel(%ebx),%eax movw %ax,TRAPBOUNCE_cs(%edx) movw $TBF_FAILSAFE,TRAPBOUNCE_flags(%edx) -- 2.30.2